From 39fb304f97f3b24a1f20329ec78896b3b1afed47 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Thu, 8 Jul 2004 04:33:50 +0000 Subject: [PATCH] Stop editing when a new model is set. (#145566, Dmitry M. Shatrov) Thu Jul 8 00:33:15 2004 Matthias Clasen * gtk/gtktreeview.c (gtk_tree_view_set_model): Stop editing when a new model is set. (#145566, Dmitry M. Shatrov) --- ChangeLog | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ gtk/gtktreeview.c | 5 +++-- 5 files changed, 23 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 10ce76ad3b..b2af759128 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Thu Jul 8 00:31:34 2004 Matthias Clasen + + * gtk/gtktreeview.c (gtk_tree_view_set_model): Stop editing + when a new model is set. (#145566, Dmitry M. Shatrov) + Wed Jul 7 23:44:32 2004 Matthias Clasen * gtk/gtkimage.c (gtk_image_expose): Make sure that subpixbufs diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 10ce76ad3b..b2af759128 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +Thu Jul 8 00:31:34 2004 Matthias Clasen + + * gtk/gtktreeview.c (gtk_tree_view_set_model): Stop editing + when a new model is set. (#145566, Dmitry M. Shatrov) + Wed Jul 7 23:44:32 2004 Matthias Clasen * gtk/gtkimage.c (gtk_image_expose): Make sure that subpixbufs diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 10ce76ad3b..b2af759128 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +Thu Jul 8 00:31:34 2004 Matthias Clasen + + * gtk/gtktreeview.c (gtk_tree_view_set_model): Stop editing + when a new model is set. (#145566, Dmitry M. Shatrov) + Wed Jul 7 23:44:32 2004 Matthias Clasen * gtk/gtkimage.c (gtk_image_expose): Make sure that subpixbufs diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 10ce76ad3b..b2af759128 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +Thu Jul 8 00:31:34 2004 Matthias Clasen + + * gtk/gtktreeview.c (gtk_tree_view_set_model): Stop editing + when a new model is set. (#145566, Dmitry M. Shatrov) + Wed Jul 7 23:44:32 2004 Matthias Clasen * gtk/gtkimage.c (gtk_image_expose): Make sure that subpixbufs diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c index 91bb183e3a..42ecbdcc39 100644 --- a/gtk/gtktreeview.c +++ b/gtk/gtktreeview.c @@ -8831,8 +8831,8 @@ gtk_tree_view_get_model (GtkTreeView *tree_view) * @model: The model. * * Sets the model for a #GtkTreeView. If the @tree_view already has a model - * set, it will remove it before setting the new model. If @model is %NULL, then - * it will unset the old model. + * set, it will remove it before setting the new model. If @model is %NULL, + * then it will unset the old model. **/ void gtk_tree_view_set_model (GtkTreeView *tree_view, @@ -8851,6 +8851,7 @@ gtk_tree_view_set_model (GtkTreeView *tree_view, GList *tmplist = tree_view->priv->columns; gtk_tree_view_unref_and_check_selection_tree (tree_view, tree_view->priv->tree); + gtk_tree_view_stop_editing (tree_view, TRUE); g_signal_handlers_disconnect_by_func (tree_view->priv->model, gtk_tree_view_row_changed, -- 2.30.2